Wake up remote Claude Code agents on new events by kjankov · Pull Request #9399 · warpdotdev/warp

kjankov · 2026-04-29T11:59:35Z

Description

Fixes orchestration v2 parent/child agent wake-up and messaging behavior for remote child agents.

This PR updates the client-side orchestration flow so that incoming parent-agent messages wake remote child agents through the server run follow-up path instead of trying to treat them like local dormant Claude harnesses. Previously, a remote child could receive the parent’s message, but it would not be restarted correctly in a harness and could fail or hang when trying to send a message back to the parent.

Main changes:

• Adds a remote-child wake path in the blocklist AI controller:
◦ detects remote child conversations with pending parent-agent message events
◦ submits a run follow-up to agent/runs/{run_id}/followups
◦ removes delivered pending message events after successful follow-up submission
◦ retries/logs failures instead of silently hanging
• Keeps local dormant Claude wake behavior separate from remote child wake behavior.
• Restores remote hidden child panes as cloud/ambient agent panes instead of local terminal-backed child panes.
• Ensures restored remote child panes enter the existing ambient session in AgentRunning state.
• Persists and restores remote-child conversation metadata so the client can distinguish local children from remote children across reloads.
• Improves orchestration v2 message sending:
◦ uses task-scoped server APIs when available
◦ adds bounded timeouts and error logging for send failures
◦ surfaces failures instead of leaving action execution indefinitely pending
• Adds regression coverage for:
◦ remote child conversation restoration
◦ remote child pane/session state
◦ task-scoped ambient agent messaging
◦ orchestration v2 message/error behavior

Testing

Server API dependencies

Is this change necessary to make the client compatible with a desired server API breaking change?
Does this change rely on a new server API?
- If so, is the use of this API restricted to client channels that rely on the staging server (e.g. WarpDev)?
Is this change enabling the use of a server API on client channels that rely on the production server (e.g. WarpStable)?
- If so, has the new server API been stable on production for at least one server release cycle? See here for more details.

Agent Mode

Warp Agent Mode - This PR was created via Warp's AI Agent Mode

Changelog Entries for Stable

CHANGELOG-NEW-FEATURE: {{text goes here...}}
CHANGELOG-IMPROVEMENT: {{text goes here...}}
CHANGELOG-BUG-FIX: {{text goes here...}}
CHANGELOG-BUG-FIX: {{more text goes here...}}
CHANGELOG-IMAGE: {{GCP-hosted URL goes here...}}
CHANGELOG-OZ: {{text goes here...}}

Co-Authored-By: Oz <oz-agent@warp.dev>

oz-for-oss · 2026-04-29T12:08:36Z

@kjankov

I'm starting a first review of this pull request.

I completed the review and posted feedback on this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

You can view the conversation on Warp.

I completed the review and posted feedback on this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR adds task-scoped orchestration messaging, remote-child wake-up via run followups, restored remote child pane handling, and persistence for remote-child metadata.

Concerns

The CLI now rejects --task-id with --conversation, which can break existing worker follow-up invocations that still pass both before the task-backed resume path runs.
V1 restored child lifecycle behavior appears to have been removed, and the poller restore path is no longer gated on OrchestrationV2, so disabled-v2 restores can regress.
The remote-child follow-up submission has no bounded timeout, so a stalled request can leave the wake permanently pending.
The local Claude wake path can mark the server task InProgress before verifying the conversation is still ready, leaving task state inconsistent if the final readiness check fails.
Security pass: no separate security-specific findings beyond the correctness issues above.

Verdict

Found: 0 critical, 5 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Co-Authored-By: Oz <oz-agent@warp.dev>

…-new-events Co-Authored-By: Oz <oz-agent@warp.dev>

cephalonaut

I think the followup based remote child wake ups ought to be driven from the server side. One good reason I think is that ultimately we will support arbitrary subscription to event sources and having the wakeups driven from the event source side seems impractical. Let me know if that doesn't make sense!

Given that, I think the claude wakeup code also ought move. Most of it is harness specific — Claude transcript envelopes, session-index files, claude --resume command construction, parent-bridge state staging. You could move it to a wake_driver.rs alongside the parent bridge and expose a single wake_dormant_session method to the controller. Controller keeps the EventsReady subscription, readiness gating, ExecuteLocalHarnessCommand emission, and conversation-status update; harness owns eligibility, context fetch, on-disk staging, command construction, and reopen/rollback.

Co-Authored-By: Oz <oz-agent@warp.dev>

oz-for-oss

Overview

This PR adds remote-child orchestration wake/messaging plumbing, task-scoped agent messaging APIs, persisted remote-child metadata, restored hidden child pane behavior, and a new Codex harness path.

Concerns

Remote child pending message events are drained locally without submitting the advertised run follow-up, which can drop the wake signal and leave the child agent dormant.
The new Codex auth seeding writes API keys into an existing auth file without correcting permissive permissions.
Codex harness conversion for server GraphQL values is brittle and can still map Codex runs to Unknown.

Verdict

Found: 1 critical, 2 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

cephalonaut

Second-pass review after the wake refactor. Most comments are small (dead code, fragile match, possible regression, asks for in-code documentation, two extraction nits). Two larger architectural notes embedded in the comments on maybe_prepare_local_claude_wake and prepare_local_wake_command: the wake decision belongs in a harness-side supervisor, and the streamer should not subscribe to dormant Claude-harness conversations at all — which collapses most of the wake's bookkeeping.

Co-Authored-By: Oz <oz-agent@warp.dev>

cephalonaut

Third pass after the wake-listener fix. The fix to the wake-trigger gap looks good. Three small things below.

cephalonaut · 2026-05-02T15:55:57Z

+                .await
+        }
+        None => ai_client.send_agent_message(request).await,
+    }


send_agent_message_with_timeout has no timeout on wasm

Not sure this is really invoked from wasm, but maybe add a comment.

cephalonaut · 2026-05-02T15:55:57Z

+                        if me.is_dormant_claude_wake_listener_eligible(conversation_id, ctx) {
+                            me.start_dormant_claude_wake_listener(conversation_id, ctx);
+                        }
+                    }


Wake-listener restart has no backoff

On Ok(None) or Err the callback immediately restarts the wake-only listener if still eligible, with no attempt counter at this layer. The inner AgentEventDriverConfig::retry_forever backs off across SSE failures, but a clean-but-empty stream close would loop tight. Add a small backoff or a bounded retry count for the outer restart.

cephalonaut · 2026-05-02T15:55:57Z

                    tx,
                    self_run_id,
                    hydrator,
+                    hydrate_new_messages: true,


hydrate_new_messages — dead flag in production?

The struct field is only set false in the test sse_forwarding_consumer_skips_message_hydration_when_disabled. start_sse_connection (this line) hardcodes true. Either remove (YAGNI) or document the upcoming caller that will toggle it.

Co-Authored-By: Oz <oz-agent@warp.dev>

kjankov and others added 6 commits April 28, 2026 15:08

Wake up remote Claude Code agents on new events

15cfad8

Fix bug with parent sending messages to children

91013fc

fix child not sending message to parent

932ca27

Handle non-retryable orchestration restore failures

392fad8

Co-Authored-By: Oz <oz-agent@warp.dev>

Align QUALITY-482 port with source branch

f7f554d

Co-Authored-By: Oz <oz-agent@warp.dev>

Wake remote child agents on new events

43804ab

Co-Authored-By: Oz <oz-agent@warp.dev>

cla-bot Bot added the cla-signed label Apr 29, 2026

kjankov marked this pull request as ready for review April 29, 2026 12:08

oz-for-oss Bot reviewed Apr 29, 2026

View reviewed changes

Address remote agent wake review comments

e20b902

Co-Authored-By: Oz <oz-agent@warp.dev>

kjankov requested a review from cephalonaut April 29, 2026 12:41

kjankov and others added 3 commits April 29, 2026 09:11

Fix WASM build for dormant Claude wake path

943b7b5

Co-Authored-By: Oz <oz-agent@warp.dev>

Fix WASM clippy for native wake paths

1f88ed0

Co-Authored-By: Oz <oz-agent@warp.dev>

Merge origin/master into katarina/quality-482-wake-up-remote-agent-on…

7209cdf

…-new-events Co-Authored-By: Oz <oz-agent@warp.dev>

cephalonaut reviewed Apr 29, 2026

View reviewed changes

Comment thread crates/http_client/src/lib.rs

Comment thread app/src/terminal/view/ambient_agent/model.rs

kjankov and others added 2 commits April 30, 2026 09:20

Prepare client for server-driven child wakes

b0ba7fd

Co-Authored-By: Oz <oz-agent@warp.dev>

fix failing presubmit checks

4b00a40

oz-for-oss Bot reviewed Apr 30, 2026

View reviewed changes

Comment thread app/src/ai/agent_sdk/driver/harness/codex.rs

Comment thread app/src/ai/blocklist/controller.rs Outdated

Comment thread app/src/server/server_api/ai.rs Outdated

cephalonaut reviewed Apr 30, 2026

View reviewed changes

Address child wake review feedback

9729b18

Co-Authored-By: Oz <oz-agent@warp.dev>

kjankov requested a review from cephalonaut May 1, 2026 09:53

kjankov and others added 3 commits May 1, 2026 14:44

resolve merge conflicts

b8ee43e

fix lint

d837a14

Wake dormant local Claude children on parent messages

5e26574

Co-Authored-By: Oz <oz-agent@warp.dev>

cephalonaut reviewed May 2, 2026

View reviewed changes

cephalonaut approved these changes May 2, 2026

View reviewed changes

kjankov and others added 3 commits May 2, 2026 12:24

Merge origin/master into Claude wake branch

acc0b93

Co-Authored-By: Oz <oz-agent@warp.dev>

fix wasm build

524b39a

fix windows build

c628fd1

kjankov merged commit 1148ae3 into master May 2, 2026
24 checks passed

kjankov deleted the katarina/quality-482-wake-up-remote-agent-on-new-events branch May 2, 2026 19:04

Conversation

kjankov commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing

Server API dependencies

Agent Mode

Changelog Entries for Stable

Uh oh!

oz-for-oss Bot commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cephalonaut left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cephalonaut left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cephalonaut left a comment

Choose a reason for hiding this comment

Uh oh!

cephalonaut May 2, 2026

Choose a reason for hiding this comment

Uh oh!

cephalonaut May 2, 2026

Choose a reason for hiding this comment

Uh oh!

cephalonaut May 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

kjankov commented Apr 29, 2026 •

edited

Loading

oz-for-oss Bot commented Apr 29, 2026 •

edited

Loading